Verify each finding against the current code and only fix it if needed.

Inline comments:
In
`@runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickDispatcher.java`:
- Around line 197-204: The registerWait method registers a TickWaiter with
startTick taken from the cached currentTick which may be zero before the first
GameTick and cause immediate timeouts; modify registerWait in TickDispatcher to
use the live client tick (client.getTickCount()) as the startTick (or fall back
to client.getTickCount() only when currentTick == 0) when constructing the
TickWaiter so that TickWaiter startTick reflects the real client tick counter
(keep references to TickWaiter and its constructor signature intact and only
change the value passed as startTick).

In
`@runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickWaiter.java`:
- Around line 91-96: The unconditional-wait branch in TickWaiter (where
condition == null) currently calls signalCompletion(true) immediately; change it
to count ticks and only resolve when the elapsed ticks reach maxTicks: record
the start tick (or use an existing startTick field), compute elapsed =
currentTick - startTick (or increment an internal tick counter each tick), and
call signalCompletion(true) only when elapsed >= maxTicks; otherwise just return
false so the waiter keeps waiting; update the logic around currentTick, maxTicks
and signalCompletion in the TickWaiter tick handler to mirror the
conditional-wait path.

---

Nitpick comments:
In
`@runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/Global.java`:
- Around line 188-209: The no-arg overload sleepUntilNextTick() currently
returns void while sleepUntilNextTick(long) returns boolean; change
sleepUntilNextTick() to return boolean and propagate the result from
sleepUntilNextTick(2000) so callers can observe timeout status, update its
Javadoc to document the boolean return, and adjust any call sites of
sleepUntilNextTick() that assumed void to handle/ignore the boolean as
appropriate; refer to the methods sleepUntilNextTick() and
sleepUntilNextTick(long) and the TickWaiter usage for locating the code to
change.

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickDispatcher.java">

<violation number="1" location="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickDispatcher.java:143">
P2: Orphaned waiters are cleared without being signaled on logout, leaving script threads blocked until their wall-clock timeout expires. Iterate over the waiters and signal their completion before clearing the queue. This requires adding a package-private `cancel()` method (or similar) to `TickWaiter` that calls `signalCompletion(false)`, then calling it here for each waiter before `clear()`.</violation>

<violation number="2" location="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickDispatcher.java:199">
P2: Edge case: if `registerWait` is called before the first `GameTick` event fires, `currentTick` is still 0 while the real tick count (from `client.getTickCount()`) may already be large. When `evaluateAndSignal` runs with the real tick count, `(currentTick - startTick) >= maxTicks` will be true immediately, causing the waiter to timeout on its very first evaluation. Use `client.getTickCount()` instead of `currentTick` here to capture the accurate tick count at registration time.</violation>
</file>

<file name="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickWaiter.java">

<violation number="1" location="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickWaiter.java:84">
P1: Tick timeout check fires before condition evaluation, so on the boundary tick a waiter that should succeed is instead reported as timed-out. Move the timeout check after the condition evaluation (or the unconditional-wait check) so the condition gets one last chance on the final allowed tick.</violation>

<violation number="2" location="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickWaiter.java:91">
P1: Bug: unconditional waits (`condition == null`) resolve immediately on the first tick, ignoring `maxTicks`. For `sleepForTicks(3)`, which calls `registerWait(null, 3, timeout)`: on the first tick evaluation, the tick-limit check `(currentTick - startTick) >= 3` is false (only 1 tick elapsed), so it falls through to the `condition == null` branch which immediately signals completion. This means `sleepForTicks(N)` always waits only 1 tick regardless of N.

The unconditional path should return `false` to keep waiting, letting only the tick-limit check above resolve it when enough ticks have elapsed.</violation>

<violation number="3" location="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickWaiter.java:135">
P2: When `await()` returns due to wall-clock timeout, `completed` is not set to `true`, so the dispatcher continues holding and evaluating this waiter every tick. If `maxTicks` is 0, the orphaned waiter stays in the queue indefinitely. Set `completed = true` before returning so that a follow-up `evaluateAndSignal` check can detect and remove it, or signal completion directly.</violation>
</file>

<file name="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/Global.java">

<violation number="1" location="runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/Global.java:85">
P1: Busy-loop when `TickDispatcher` is null. If `sleepUntilNextTick` returns immediately (dispatcher not yet initialized), this loop spins with zero delay, pegging the CPU at 100% for the entire timeout. Add a fallback `sleep` when tick-based waiting is unavailable.</violation>
</file>

Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In
`@runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/Global.java`:
- Around line 222-224: Add a short inline comment to the sleepForTicks(int)
method explaining the timeout formula used in the default argument (ticks * 800L
+ 2000), e.g., note that 800L represents a conservative ~800ms worst‑case per
game tick and the +2000 is a 2s safety buffer to handle server lag; place the
comment adjacent to the return statement or method signature in the
sleepForTicks method to make the "magic numbers" self‑explaining.

In
`@runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/tick/TickDispatcher.java`:
- Around line 41-43: Add a shutdown method to TickDispatcher that unregisters
the retained subscribers: implement public void shutdown() {
eventBus.unregister(gameTickSubscriber);
eventBus.unregister(gameStateChangedSubscriber); } so tests and shutdown logic
can call TickDispatcher.shutdown() to cleanly remove the subscribers stored in
gameTickSubscriber and gameStateChangedSubscriber; ensure the method is public
and idempotent (safe to call multiple times).